From 5ad682c6772d4f71cb9e691e2853eb5a2b9db973 Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Wed, 21 Dec 2005 23:14:20 +0000
Subject: [PATCH] Fixed directory name to create for the application. Defined
 mutex (and create in utils.pas) to tell "Setup" that we are running. Replaced
 several locations of version and release with const definitions. Changed
 basename for setup package to iGPSBabel-{#Version}{#Release}.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@1663 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/win32/gui-2/gpsbabel.iss | 37 +++++++++++++++++++++----------
 gpsbabel/win32/gui-2/utils.pas    | 13 +++++++++++
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/gpsbabel/win32/gui-2/gpsbabel.iss b/gpsbabel/win32/gui-2/gpsbabel.iss
index 77ee725e3..8de7c0601 100644
--- a/gpsbabel/win32/gui-2/gpsbabel.iss
+++ b/gpsbabel/win32/gui-2/gpsbabel.iss
@@ -1,11 +1,14 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
+#define Version "1.2.8"
+#define Release "-beta12012005"
+
 [Setup]
 AppName=GPSBabel
-AppVerName=GPSBabel-1.2.8-beta12012005
+AppVerName=GPSBabel-{#Version}{#Release}
 RestartIfNeededByRun=false
-DefaultDirName={pf}\GPSBabel-1.2.8
+DefaultDirName={pf}\GPSBabel-{#Version}
 ShowLanguageDialog=auto
 OutputDir=C:\TEMP
 SourceDir=.\
@@ -13,7 +16,7 @@ DefaultGroupName=GPSBabel
 AlwaysUsePersonalGroup=true
 UserInfoPage=false
 EnableDirDoesntExistWarning=true
-VersionInfoVersion=1.2.8
+VersionInfoVersion={#Version}
 VersionInfoCompany=GPSBabel makers
 AllowRootDirectory=true
 AlwaysShowGroupOnReadyPage=true
@@ -21,21 +24,26 @@ InternalCompressLevel=fast
 WindowVisible=false
 SetupIconFile=GPSBabelGUI.ico
 DisableFinishedPage=false
-AppVersion=1.2.8-beta12012005
+AppVersion={#Version}{#Release}
 UninstallDisplayIcon={app}\GPSBabelGUI.exe
-UninstallDisplayName=GPSBabel 1.2.8
+UninstallDisplayName=GPSBabel {#Version}
 AppPublisherURL=http://www.gpsbabel.org
 AppUpdatesURL=http://sourceforge.net/project/showfiles.php?group_id=58972
 DisableStartupPrompt=true
 AppID={{E25E9E85-2244-4AB0-B00D-7F44C6E9F635}
+AppMutex=GPSBabelGUI_mutex
+OutputBaseFilename=iGPSBabel-{#Version}{#Release}
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
 
 [Files]
 Source: GPSBabelGUI.exe; DestDir: {app}; Flags: replacesameversion
+Source: README.gui; DestDir: {app}
 Source: ..\..\mingw\libexpat.dll; DestDir: {app}
 Source: ..\..\mingw\gpsbabel.exe; DestDir: {app}; Flags: comparetimestamp ignoreversion; Languages: 
-Source: README; DestDir: {app}
-Source: README.gui; DestDir: {app}
-Source: ..\..\README.xmapwpt; DestDir: {app}
+Source: ..\..\README; DestDir: {app}
 Source: ..\..\COPYING; DestDir: {app}
 Source: ..\..\README.contrib; DestDir: {app}
 Source: ..\..\README.igc; DestDir: {app}
@@ -43,18 +51,24 @@ Source: ..\..\README.magnav; DestDir: {app}
 Source: ..\..\README.mapconverter; DestDir: {app}
 Source: ..\..\README.psp; DestDir: {app}
 Source: ..\..\AUTHORS; DestDir: {app}
+
 [Dirs]
-Name: {pf}\GPSBabel
+Name: {app}
+
 [Languages]
 Name: en; MessagesFile: compiler:Default.isl
 Name: de; MessagesFile: compiler:Languages\German.isl
 Name: fr; MessagesFile: compiler:Languages\French.isl
+
 [Icons]
 Name: {group}\GPSBabelGUI; Filename: {app}\GPSBabelGUI.exe; WorkingDir: {app}; IconFilename: {app}\GPSBabelGUI.exe; IconIndex: 0; Flags: useapppaths
 Name: {group}\{cm:UninstallProgram, GPSBabel}; Filename: {uninstallexe}
-Name: {userdesktop}\GPSBabelGUI; Filename: {app}\GPSBabelGUI.exe; IconIndex: 0; Tasks: 
+Name: {userdesktop}\GPSBabelGUI; Filename: {app}\GPSBabelGUI.exe; WorkingDir: {app}; Tasks: desktopicon; IconIndex: 0
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Medical Archive; Filename: {app}\GPSBabelGUI.exe; Tasks: quicklaunchicon; WorkingDir: {app}; IconFilename: {app}\GPSBabelGUI.exe; IconIndex: 0
+
 [Run]
-Filename: {app}\GPSBabelGUI.exe; WorkingDir: {app}; Flags: postinstall unchecked
+Filename: {app}\GPSBabelGUI.exe; WorkingDir: {app}; Flags: postinstall unchecked skipifsilent; Description: {cm:LaunchProgram,GPSBabelBUI}
+
 [Code]
 var
   GPSBabelPathRead: Boolean;
@@ -101,4 +115,3 @@ begin
     end;
   end;
 end;
-
diff --git a/gpsbabel/win32/gui-2/utils.pas b/gpsbabel/win32/gui-2/utils.pas
index 945318322..62b491dc3 100644
--- a/gpsbabel/win32/gui-2/utils.pas
+++ b/gpsbabel/win32/gui-2/utils.pas
@@ -305,4 +305,17 @@ begin
 // !!! TRICK !!!
 end;
 
+var
+  hMutex: THandle;
+  
+initialization
+
+  // Flag for InnoSetup
+  hMutex := CreateMutex(nil, True, 'GPSBabelGUI_mutex');
+
+finalization
+
+  if (hMutex <> 0) then
+    CloseHandle(hMutex);
+
 end.
-- 
2.30.2